Additional changes for Anlage function