Vishnu, Gopal | #0 | Refactoring Case and FLW to remove forms dependency