Fixed special attributes in defintions