Added missing implementations