Updated the core modules to be reuseable in the backend as well