Added annotations on start-up