More changes to add local/remote bean setup