Updated current implementation for 10.3.1 support