Added stuff to constructors...