Modified to resolve build errors