Changing file name
Adding message builder
Refactoring