New convenience methods. Updated mapping. Updated samples.