[WIP][TASK] Added some extention functionabilty