Added some things and made it more configurable