Adds support for animated and bottom quickreturn