Updated to use v0.10 type class