Fixed class name and added mobile/smartphone case