Multiple-buildings functionality added

Multiple-buildings functionality added