Angular records refactor