Adding stuff for off-line processing