Resolved dependency issues