Add AdviceAttribute and clean up Obsolete attributes