FIX: Add all methods