Trying to resolve reference issues