Added abstract support