Updated readme and map support