Angular records refactor

???