Updated for Umbraco 6