Simplified implementation with interface changes
Version 0.1.0 => 1.0.0