Updating logic in #95: Adding enum fields