Modify Building Class

Based on the requirement