Added features for better docs