Map/block support added!