Modularisation + sl4j ready