Move code where it belongs
Simpler code
Break dependency to Site and still enables custom helpers
Trying to get rid of Site.get() usage
Simpler code