Adopt to latest changes on the original project
Adopt to latest changes