Added framework
Changes in messages