Move stuff in management rather than depedency/plugin