Small class interfaces changed