Removed lines modified fields, fix mappings