Basic Mob Support, Refactor