Shape resolvers added