Trial: Improve memory handling ...