Simple Formatting
Added many of the Map method signatures.