Fixed small remake issues.
Added Holder parent class.