Fixed #40 and moved to new DB via globals instance