Added features and extension