Removed project-specific code for a more generic version