Added spec and features