Revamped the internat mechanisms of the application, allowing more flexibility