Fix #49 - Resolve catalog