CFY-1231 modified usage of fabric plugin