Added more implementation