Cleand up batch system + direct acces to property map via material batch