Making more things extend klass