Initial production-ready implementation