Added casts + API