Added make production ready code