Fix CLI module to work with new and buil