Passed map info as property, have new bugs