[BUGFIX] Changed mapping for integer to xsd:int, added mapping from long to xsd:long