Don't use singleton, fix dependency issue