Added Database support through Waterline