Add more functionalities to mapping annotations