Worked on shop management and metadata classes