More attributes and Ubuntu support.