Fixed Jira Issues NA-89,91,92,93,94