Service tweaks for faster loading