Add more PIE support