Made database static/added a few methods