Added some things for setup