Updated our code structure and optimised it for better performance @ Azile