Modified from class to define