Add some configurability