Improved expresiveness [ci skip]