Add fields to core classes
Merge pull request #1 from Bj0rnen/master

Add fields to core classes