Towards Enhanced Controllability of Diffusion Models