Added rebuild and extensible handleable feature.