Get optionals from new place.
Merge pull request #27 from adam-vessey/7.x-ISLANDORA-945

Get optionals from new place.