[ORB-295] Fixed indentation; added support for extra fields