(feat) Add new functioning directive and general clean up