Further work on the main core of the framework