Added compatibility with DevMate.