Initial commit to update production-ready state