added changes to support long datatype and mobile location