Added contains function
Added map function