Adding compilation support