Moved the used Classes inside user-additions