This inheritance seems to be redundant but I'm happy to merge as is.