It is about time this feature was added ????