Added support for user-defined tags and interfaces