Added functionality for non-express environment