Moved properties into config file