refactored GB and FB Repository