Updates to support Swift classes by changing . to _ when creating collections