Updates for compiler