Rebuilt proper classes using coffee