Improved scenes integration. Fixed tables relations names in content module