Added super constructors etc.