updates to allow for @return annotations