Added config and updated code