OGM-401: Add support for attributes of types short and float

Please review