Enhancement: Leverage class keyword

/cc @ins0