Slightly fixed missing form classes