Several improvements

o to annotation
o convenient functions
o helpers