Make class instantiation more sane