added waterline & db models