Added MatchBox class and fixed Enum mapping in database.