Include more improvements