Added compiler support