Classes improved, methods and props added.