Add base data classes