Added more shape types to simulation