Annotations management + HTTP proxy in progress