Wave reorganization
Minor bug correction
Bug correction about Wave.getMap() visibility