Adds specs
Improves custom field handling