Better Field Implementation
Map Rules, refactoring