Refactor (Object instances) + composer + config