Code changes to match namespace