Improved and more complete conceptual model for the revision of IndoorGML