Collection to Database Model refactor
Collection to Database refactor
docblock update