Upgraded classes to Reference Based & Working model