Refactor Field model
Fix rake spec