Improves class calling