Adjusted API for easier use