Now using the Assembly Codebase instead of Location