Added alias check into findById method