Added behaviour to keep non-standard objects