Add General methods implementation, Add some Unit Tests