Moved custom class into separate presentation