Removed type class abstraction