Added spec and code