More attributes support