Added features from original wiki