Moved methods from Plugin to Utils