Hotfix/memdiet

Enhancement to reduce memory consumption