Feature/203 runtime performance