Added optional support for mapping annotation