[CLEANUP] Improved the general structure