Created class, improved initialization