Added configurability through code