WIP: aspects refactor