Add more sample classes for UI