made map more generic