Add support for references
Remove HTTP interface
Add missing case to prevent warning