Add newline
added mapping support and suggest