More robust classes impelementation