- Added metadata definition & motion logic