Added refined use cases and added more scenarios