Changes to framwork
Changes to mysql schema