depend from angular messages in a more maintainable way