Refactored Collection to use getValue everywhere
Merge remote-tracking branch 'origin/master'