Specs added and some improvement