Added config and file loading