Removed some hardcoded string, moved them into config property