These should have been added all along