Add instance and fixed isOnBase