Tweaked resourceserver/client definitions