updates to support config file etc