refactored most facades; code simplification using better providers