Added initial records and refactored