Stream Maps Refinement and Enhancement