Replaced static call with self:: instead of hard-coded class name