Cleaned up params class
Expand spec