Quick changes to sllow use in other plugins