Added some classes/methods which do nothing (yet)