pts-core: Improvements