Refactor annotations, initial work on ignored slots