Added initial animation suppport