Agreed. If you want, let's get this PR merged and then you can attempt at adding the super class? It is up to you :)