Rebuild some methods