Refactored policies DB model