Added more Map functions, a couple of them are still not finished