Better handling of injected attributes