Add support for variables in partial helper and multiple files for user_data helper