Needs to be Merged with MePlugin