Added initial Listener implementation