Fixes related to recursive service and instance lookup
Fixed issues with file and jpa configuration