Added Map to header and some improves