Added collapsed attribute