Adjusted class property setup and connection logic.