Changed Procedure calls from Maps to Provider interface