Sources updated to incorporate engine API changes