Fix #11 Custom classes