Added api classes, storage classes, and updated the core