Bug fix
Add support for all attribute datatypes