FIX: HTTP_NOT_SUPPORTED error
Convert Builders to use new validators
Integration tests should use highlight field for highlighting