Added 'unique' and 'not null' support