Added features and functions