Self-consistent modelling of ICRH requires calculations of the wave field consistent with the distribution function of the resonant species. Because of the difference in time scales for wave propagation and the evolution of distribution functions this is commonly done by iterations. A robust code SELFO-light, suitable for routine calculations was recently developed, based on coupling a 1D time dependent Fokker-Planck code with the global wave solver LION using a FEM. Here the structure of an upgraded version of the SELFO-light code is presented calculating the distribution function with a 2D Fokker-Planck code. This requires new interfaces calculating the quasi-linear diffusion coefficient from the wave field and the susceptibility tensor from distribution functions.