Readded old features to improve coverage