Added custom decorator