Added more annotation support fixed small bug