[Fix/Data] Improve wildcard patterns and fix related data

Fixes #3