remove weakhash map
+ add locale component