Updates for Codova 3