Added facade resolver