upgraded resgitry behaviour for better logging and return messages