Add KVO and two-step animation shortcuts