Added extra features for testing