Added a few missing things, this refactor still ongoing