refac function loading to use annotations