Added some configurability and better defaults