Prefabs improvements