Added modules&states, Extended formula

Change-Id: Ifcf2509e8c21853ed86d5852c3595888c5316edd
5 files changed