Added Environment substitution, fixed namedsubmaps