Fixed chicken next support
Improved rebuild command support