[IMP] project : Improve code as per requirement