Refactored all pub models to be uniform in preparation for HS:Post gem