Moved field bases and instances out of module