Reimplement target/action accessors - Fix #21