Add wrapper for both public collection and public item view