Added facade handling