Add Records factory
Change naming to be more explicit