REFACTOR: for MakeMe 0.8.4 with plugins