Fisrt version
Adding map