Added state listeners