Moved helper methods for fields as extensions
Fixed merge conflicts