Updated facade namespace