Output construction

Moving output dependency into the constructor for the core