Added spec and lib