Fix for Issue 1 and application speficic obj repo