Added bunch of new things