Updated and simplified class