improved PSR-0 mapping