* BAEL-707 Add the changes as per review comment * BAEL-707 Refactored the code as per review comments