Add configurability