Prepare for proper prefilling

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>