new architecture: was added branch, message objects and other
Bad last commit with this files