Extra features for testing