Improved metadata handling, added part of animated objects