Added config and config loader