Added listener implementations