Update my code to work with cmv-app v1.3.2