Changes for external libs