Added ArrayList to retain Listener references

Added new Method / Array List to keep references / clear references