Fixed annotation loading problem, not feature complete yet