Added features and docs