Restore lazy service loading