Enhanced SDK classes