Moved field names to static variables