Removed field definitions in favor for schemas