Adding build support