Add support for singleton and write interfaces