Added :UserShape type