Updated features and tests