Fixed DB - Refactored