Additional work on curriculum matrix