Added compiler support (broken)