[WIP][TASK] Continue work on the extention system