Changed map to interface