Upgraded Service Stack and Top shelf