Refactored DB naming, added ratio relations