More attributes added, still incomplete