ENH: Make sitebase much more homogeneous