Added Many more funcionalities