Improve Topics support to Records