Added new implementation for the following feature requests: