Added bunch of stuffs