Add initial Social API support
Small apparance improvement