Added call to super & added JavaDoc