Updated shape interface