Updated API and created hub module