[WIP] Introduce rebuld argument