Make production ready