Modification to retrieve external properties JPA

Change in response to comments in PR