Adding some includes
Adding value lists and updating some headers
Merge remote-tracking branch 'origin/master'