Removed the cyclical dependency below. Please this is not a multi-module project