added mapping support and suggest