Made sample cell more generic