Extended message builder to utilize attributes
PSR fix