Add base-classes