Type safe annotations added