Updated code to work with latest reorganization