More elegant way to add collapsed option