Added support package/extend structure
Added test output