UPDATE: Improve compiler