Switched to shared directory approach