Worked mainly on domain -> resource conversion