Fabfile improvement