Added more updates from original repository