Reworking to pull field types from config