Added some genstuff