Removed define from fields