make building manager more robust, add fields for PLUTO lookup