Updated exports and fixed field groups
Removed field groups