Added crosscutting concern. Fixes #3