Base: Add support to accept data and map URL data

Almost done…