OK. I check to resolve these dependencies in a better way and I'll commit. Thanx