Updated some syntax to use case objects