Added current/active support