Changed API for consistency