Added aspect and tests.