Added resolve hack. Updated logger.