Adding map restriction info to finishes
Updating dataLayer for availablity, simplifying the model, adding collection helpers