Added support for nullables and text attribute