Facades support added and some major fixes