BlueWhaleProperties is now an Enum. Made some code refactoring.