Default condition handler

- Add default condition handler management