Added listeners and some configuration code