Added memo support