Added new util classes & extended api