Add possibility to mark a class as singleton without an annotation