Added a comprehensive build