Added some configurability