Adding spec and features