Restored methods for testing purposes