Updated Map of forms