Data modelling was in complete in previous commit. Hopefully its done now.