Add macro for subpackage use