Adding state where possible, as per best practices