Using configuration from MJanssen