Added Forms and basic API