Added functional outputs and logs