data types definition updated so it fixes #6