Fixed conflicting method definitions