Added listeners and queries