Added support fro static maps