Initial code
Remove depracation warnings from specs