Adding more initial buggy support