Improved speed of CLI modules