Moved ElementManager back in package handler