Improved Cell spec