Update to more decent structured syntax