Added more platform/api classes