Finishing CoR implementation