added support for distinction between object and beacon, added object catching