Fixed issue: Fixed DB schema