refactor property loader and added PK to config