Updated configuration. Added TODO