More 1.5 Class updates

Signed-off-by: Steven Downer <Grinch@outlook.com>