After adding Shape Class