FIX: API Changes / public fix