Fix #82 (Map codependency validation)