Improved localization module