Puma added and structure copied from network services