Added initial support for attractors