Add comments [MJ-670]