Add abstract support and tags to Affinity