Adding shadow table and output requirements