Move field names storage to separate class