Updated the target code and related files