Use annotations, bring a bunch of stuff up to spec with current api