Fully generalised advection and diffusion components