Towards a comprehensive physically-based rainfall-runoff model