CFY-999 moved implementation into nova plugin