Small changes to make it easier customize the tool from other plugins