Remove Listener and just use Object