Added missed elements