Made class public and added some properties