updated class names to avoid conflict, added few more data points