Added new methods for testing