Improves the convenience

o also adds new tests
o adds new function file for annotation features