Implement missing specs