More Plugin work, added Extension class