Adding build support and comments