Updated method implementations.