More class skeletons and interfaces [ci skip]