Completely removed objects support to recreate it other way