Update: prepare for generating java code