More work on Subsite class