Added register class and updated make