Moved property maps to bucket units instead of sources