Feat/database enhancements

Fixed merge conflicts and the req object parsing.