Added option for replacing behavior current/full