I agree with the annotations, if it should be a standard, it should get placed inside the CS. /cc @fabpot