removing yaml block pattern hack and use better pattern syntax