Solved TODO in DefaultObjects