Last changes before migrate to JellyNow