Add support for package interface