Updated SIMC and build files