Adding Build Tree and EM support