Refactored and updated prefabs