Update to use simple-class