Change object dir detection
Add badges