Updated with klass.js