Add core lib classes