Added listener and module options