Fixing deprecated method use.
Adding new static builders.