Add prefix option; Refactor configuration options