Added integer support (in addition to string.)