CLASS_DECLARATION marcos replaced