Improvements

Signed-off-by: Flavio De Stefano <flavio.destefano@caffeinalab.com>