Added compilation support